More fixups

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

See individual commits

Merge request reports