Fixed an issue with dispersion corrections and switching for water box.