External repositories management: Small fixes