Tweaks to get the JPA tests passing.