Numerous syncing fixes