WF 3.0 fixes