Fix some hibernate loading issues in context of bug #220