Some fixes on thumbnails