More cancellation fixes.