Better handling of small images