Water calculator fixes