Fix repair instrumentation