Lots of installer fixes