Fixups

Merged Dave Patrick Caberto requested to merge SeaDve/bustle:pre-filter into rustle

See individual commits

Merge request reports