More water generation fixes.