Fix more error. Need to test synchro.