Fixed upload thumbnails, minor fixes all around