Bug/more sync fixes