Fixes to instrumentation