fixups for use with PAPI 5.3.0