More fixes for synching.