DP Policy - Misc Fixes