Fixed issues related to synchro