diff --git a/_includes/site/layout/docs/tabs.html b/_includes/site/layout/docs/tabs.html
index 6e1dd87549..8fe0284173 100644
--- a/_includes/site/layout/docs/tabs.html
+++ b/_includes/site/layout/docs/tabs.html
@@ -50,7 +50,7 @@
           possibly, and we do not want the trailing "index.html".
         {% endcomment %}
         {% assign doc_name = page.path | split:"/" | slice:2,999 | join:"/" %}
-        {% assign url_name = page.url | split:"/" | slice:3,999 | join:"/" | remove:"/index.html" %}
+        {% assign url_name = page.url | split:"/" | slice:3,999 | join:"/" | remove:"index.html" %}
         
         {% assign versions = site.data.doc_version_index[doc_name] | unshift:'latest' %}
         {% unless versions %}
diff --git a/app.yaml b/app.yaml
index cbf71f1c53..c1456dd7d0 100644
--- a/app.yaml
+++ b/app.yaml
@@ -29,6 +29,6 @@ handlers:
   secure: always
 
 - url: /(.*)
-  static_files: www/\1/index.html
-  upload: www/(.*)/index.html
+  static_files: www/\1
+  upload: www/(.*)
   secure: always