[PATCH imagefactory 0/2]: Small fixes