Some small instrumentation tweaks