Fixup detection
Add DPID