Installer fixes

Please get these in before 2.0.0-RC2 :)