Fix JPA bugs
Try fix