Improve swap sync handling