Heri | NA: Fixing DW build