Small changes in TaskQueue