Small improvements to the JPA store and Credential Handlers.