Minor fixes
Updated startup logic