Fix some more compile failures
Move another depedency on hibernate to the persistence subproject