Fixes for DB_CUSTOM_V2