Fixup references and the sample