d2: fix inheritant issues

Change-Id: I195f95c69b787196ec044c7ca0c3495c324ee712