db fixes
Shift ready, prepare for release