Fixes related to 4-point water model in OpenMM