More JPA related changes from initial testing