Fixed Water problems with upgrades