Misc hot fixes

Merged Markus Scheidgen requested to merge v1.0.5-misc-fixes into v1.0.5

Merge request reports