Fix startup errors
Merge pull request #1229 from Skillert/startup

Fix startup errors