Fixes for fresh water detection.