Fixes to instrumentation for 070