Tweaks to instrumentation