Tweak for TaskManager