Fixes on the JPA mapping