Minor updates to Papi