more fixes to instrumentation