Fix JPA-relevant fields and annotations