Fixes to installer