Bug fixes to installer