Minor fixes to installer/upgrader