Update to 0.24 references and CC