diff --git a/static/js/pandora/upload.js b/static/js/pandora/upload.js
index b9a5ed3b..00c8352e 100644
--- a/static/js/pandora/upload.js
+++ b/static/js/pandora/upload.js
@@ -43,6 +43,9 @@ pandora.ui.upload = function(oshash, file) {
                 maxRetry = response.maxRetry;
             }
             chunkUrl = response.uploadUrl;
+            if (document.location.protocol == 'https:') {
+                chunkUrl = chunkUrl.replace(/http:\/\//, 'https://');
+            }
             if (chunkUrl) {
                 that.status = 'uploading';
                 that.progress = 0.0;
diff --git a/static/js/pandora/uploadDialog.js b/static/js/pandora/uploadDialog.js
index fe05406c..ff11b47c 100644
--- a/static/js/pandora/uploadDialog.js
+++ b/static/js/pandora/uploadDialog.js
@@ -281,7 +281,7 @@ pandora.ui.uploadDialog = function(data) {
         options.noUpscaling = true;
 
         if((!info.video.length || (info.video[0].codec == options.videoCodec
-                && info.video[0].height == options.height))
+                && info.video[0].height <= options.height))
             && (!info.audio.length || info.audio[0].codec == options.audioCodec)) {
             options = {
                 passthrough: true