Thumbnails and a fix