Fix isRunning check
Minor fixes to startup