fix swaps, versions