More fixes to installer
Fix installer