Fixes to basic installer