Some DB fixes. Still need to work on update to source. See notes.