Got pid->roid mapping right this time, a few fixes from IFC4 merge