Fixes for the Buiild and renoved hibernate