more small sync tweaks