Fix JPA annotations