Fix issues in HibernateInterceptor