Minor fixes to startup