Fixes and changes for tasks.