Update repo urls
Fix iteration