Build_installer fixes