Some more task system tweaks