DC: quick fixes to handles

its still ugly and hacky, working on a new way

Change-Id: Ic68902ca93254bef626e9079341a92fee41a8259