Fixed Splash issues