Hotfixes for install.sh