Fix derp and track cafs from cm