Fixes for Splash Screen