Fix up the Dispatcher creation for the latest SDK