Various fixes for install.sh