Updated to latest ECJ version