Merge in storm surge tweaks