Misc bugfixes

Joshua Goinsrequested to merge
work/redstrate/misc-bugfixes into master

This is mostly cleaning up the mess I created with other refactoring

Merge request reports