Cancelling tasks and context menu fix