[Splash] some fixes