DP Policy - Misc fix