[Misc] Fix JPA Issues