Better handling of swapper reset
Ignore fewer things