Update to ECJ + fixes

Warning: dependency change.