Fixed all the weird syncing issues