deployment attempt 1: JPA relation fixes