Groveler fixes for ECL.