Turn Swapping Fixes