Cleanup, fix startup issues