Upgrading to the latest Hibernate 4 version will give us a lot of bugfixes and help us keep current with our dependencies. This migration seems to be more easily done now that we've upgraded to Spring 4.2+.