Compilation fixes due to missing P template parameters.