Bugfixing, Hibernate upgrade.