Uploader changes (and others)