More installer fixes