add fixes in tasks