s4sync fixes