Fix stuff lost in merge
Fix stuff lost in merge

chrisfried/DIM,LouisFettet/DIM,delphiactual/DIM,48klocs/DIM,DestinyItemManager/DIM,delphiactual/DIM,bhollis/DIM,chrisfried/DIM,DestinyItemManager/DIM,chrisfried/DIM,DestinyItemManager/DIM,delphiactual/DIM,chrisfried/DIM,bhollis/DIM,48klocs/DIM,48klocs/DIM,LouisFettet/DIM,bhollis/DIM,delphiactual/DIM,DestinyItemManager/DIM,bhollis/DIM