Fixes for Hydrostatic