A few updates to papi() to prevent warnings flood