Fixed task runner bugs