Db change and fixes