Slight Fixes to DW

Stefano doesn't quite work yet.