Fixes and refactors

Merged Dave Patrick Caberto requested to merge SeaDve/bustle:more-more-fix into rustle

See individual commits

Merge request reports