Configurator fix (Gateway detection, gateway injection)