Fixes to tracing cyclic structures