ECL compatibility fixes.