WD fixes and more