Kitchen unit water fixes

Fixes both issues in #3257.