Fix instrumentation errors