fixes on the hibernate and settings