Better consistency in repository segments