Fix some splashes