Minor tweaks in performance monitoring