Fix Infobase Sync issues