Additional fixes for the automated installer.