More fixes for repo sync