Improve disabling of /co