Hibernate fix + review fix