Updates to cpp-common