Improved handling of full sync