[pd] Get everything compiling again with rust master