Fix syncronization issues