Misc tweaks

Merged Theo Steininger requested to merge misc_tweaks into master

Merge request reports