Minor changes due to Hibernate upgrade.