Fixed some instrumentation