Slight CS fixups after CR