Fixing DW defaults for issue 345