JPA Errors fixed