Additional changes to sync checking and events