TaskHandling Fixes