Fix syncronization problems