Fix some JPA startup behavior, eliminate iterator post load hack