Minor fixes for configurator