[3.9] Fix some issues in repos