Fixed Swap Compile Issues