Fixes for OpenJPA, TomEE and OWB