Updated the DW version and enhanced logging
Various fixes to support the DW upgrade