upstream fixes, fix prc as well