Some fixes for installer.