Fix US and CTT configs to work together