Do a better job dealing with repos with special characters in them