fixes for syncing issues