bug fixes to ScpUploader