Improved cancellation checks