More dump_swap stuff