Fixed refactoring problems
More installer tweaks