updates for new thread policy; fixes'