WI and Task Group Update Bug Fixes