DB fixes
Merge origin/master