BP-DB-import-fixes