Toon Water and Idle Oar fixes