Should fix all the hibernate errors related to the pull request branch confusion from bobrich's code.