Some tweaks to hard-coded CC locations