Minor 'fixes' to tracing