Fixes

Fixes #153 (closed). There went my hopes of it being a bugless merge.

Merge request reports

Loading