Fixed reference from Gateway to DH.Device and DH.Binary