More changes to uploader components.