Fixes for SWAP