Minor fixes to startup and config files