Fixed some strange syncing issues with crazy hacks. :/