Bugfixes in task definition