Fixing some funky issues with startup