Tweaks for OGS compatibility.