Misc Claudia DB fixes