Picasso/ImageApi improvements