More fixes for new sync script.