Minor Fixes for DB_CUSTOM_V5