Fixed WF issues