More fixes to installer