Image repository fixes