Fixing some hibernate fetching issues