DB fixes
merge