tweaks to get it running on WF