Dpc more

More issues related to dpc code are resolved.
Does this have a test to verify that this refactoring is equivalent?