Fixed all async issues so far with task_handler / manager etc