Gate/Shield Liaison for DHD

minor fixes