minor jpa/hibernate related changes