Porting improvements from imagemagick-builder over