More granular repair instrumentation