Fixups

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

See individual commits

Edited by Dave Patrick Caberto

Merge request reports