don't go in the water

A collection of 2 issues