"Add Gateway", fixes