diff --git a/sdk/storage/sample/main.cpp b/sdk/storage/sample/main.cpp
index f61db64cd..7bb1f893a 100644
--- a/sdk/storage/sample/main.cpp
+++ b/sdk/storage/sample/main.cpp
@@ -39,6 +39,7 @@ int main(int argc, char** argv)
       auto func = sample.second;
       func();
     }
+    return 0;
   }
   else
   {
diff --git a/sdk/storage/src/common/storage_uri_builder.cpp b/sdk/storage/src/common/storage_uri_builder.cpp
index 1a7a38ff7..e781bb5f4 100644
--- a/sdk/storage/src/common/storage_uri_builder.cpp
+++ b/sdk/storage/src/common/storage_uri_builder.cpp
@@ -5,6 +5,7 @@
 
 #include <algorithm>
 #include <cctype>
+#include <iterator>
 #include <vector>
 
 namespace Azure { namespace Storage {