Minor bugfixing (JPA defs).