Eclipselink fixes