Fix of repository management