More fixes for installation phase. Thanks to AndreasJung