Attempting to fix some spawn-on-splash-screen bugs.