Cancel fix

Ensures we properly clean up pending jobs when they get cancelled.