More tweaks for PAPI counter discovery