Minor Fixes for DB_BASIC_V2