Fixed bugs in Configurator et al.