Fix waterskins holding more water than they should. Closes #367