More cancel fixes