Install fixes

Merged Markus Scheidgen requested to merge install_fixes into v0.8.1

Merge request reports