Minor changes to account for behavior of DWS