fixes in wf