Other changes needed to support a new DevNet