Some fixes in dpi groups

Change-Id: I8b61202f2160e959291b65d767f87fda1d1510ee