More waterlevel enhancements