Merge in latest DB fixes for scripts