More task bugfixes