SDK configurator fixes