Several improvements when there are just 1 repo.