Fixed problems with startup.