Fixes to endch fixes.