Some improvements in task submitting/canceling