Minor fixes for instrumentation.