Sync fixes and improvements