Fix some syncing issues, hopefully