Splash fixes