Fix uploader to work correctly with all types