Made a couple of changes Hibernate not working

Yet