Fixes for allowing driver_options_key to be different from driver implementation.