small fixes for dwb