Minor JPA changes