diff --git a/lib/buildS3VersionList.js b/lib/buildS3VersionList.js
index 82a3106..8a984ff 100644
--- a/lib/buildS3VersionList.js
+++ b/lib/buildS3VersionList.js
@@ -32,8 +32,10 @@ function getVersion(params) {
                     s3DataContents = s3DataContents.concat(contents.DeleteMarkers);
                     if (data.IsTruncated) {
                         params.VersionIdMarker = contents.NextVersionIdMarker;
+                        params.KeyMarker = contents.NextVersionIdMarker;
                         recursiveCall(params);
                     } else {
+                        s3DataContents = s3DataContents.filter((elm) => { return elm.Size > 0 })
                         deferred.resolve(s3DataContents);
                     }
                 }
@@ -129,7 +131,9 @@ function getVersion(params) {
             runDeltaOnly = params.runDelta || false;
         }
 
-        s3 = new AWS.S3();
+        s3 = new AWS.S3(
+          {signatureVersion: 'v4'}
+        );
 
         var deferred = q.defer();
 
diff --git a/lib/s3ToDynamo.js b/lib/s3ToDynamo.js
index 4586f4b..9b5e61b 100644
--- a/lib/s3ToDynamo.js
+++ b/lib/s3ToDynamo.js
@@ -74,7 +74,9 @@ function s3ToDynamoDb(params, versionList) {
             dParams.RequestItems[destTableName].push(action);
         }
         console.time('P2D' + version.Key);
+
         dynamoDb.batchWriteItem(dParams, function(err, data) {
+
             console.timeEnd('P2D' + version.Key);
             if (err) {
                 return deferred.reject(err);
@@ -101,8 +103,12 @@ function s3ToDynamoDb(params, versionList) {
             deferred.reject(error)
         }
 
-        s3 = new AWS.S3();
+        s3 = new AWS.S3(
+          {signatureVersion: 'v4'}
+        );
+        console.log("DynamoDB params:")
         console.log(params);
+        params['signatureVersion'] = 'v4';
         dynamoDb = new AWS.DynamoDB(params);
 
         s3Bucket = params.bucket || '';