Minor fixes for consistency with other installers

Need to get back to work on this...