Fixes from previous commit

Fix startup error, small typo
Cleanup if statement.