First batch of gen config changes