Some fixes for vnswap