Add tweaks for Tasks