Make sure we handle CANCEL/ACK properly (imported with mods from 1.2)