More fixes - had somehow commented out trace.hh