Various cancel fixes.