core DB fixes