diff --git a/demo-with-google-logins/app.yaml b/demo-with-google-logins/app.yaml
index 1d6ef71..3cd13a9 100644
--- a/demo-with-google-logins/app.yaml
+++ b/demo-with-google-logins/app.yaml
@@ -1,10 +1,12 @@
-application: yourappid
-version: 1
-runtime: python
-api_version: 1
-
-handlers:
-- url: /stats.*
-  script: $PYTHON_LIB/google/appengine/ext/appstats/ui.py
-- url: /.*
-  script: main.py
+application: yourappid
+version: 1
+runtime: python27
+api_version: 1
+threadsafe: true
+
+handlers:
+- url: /stats.*
+  script: google.appengine.ext.appstats.ui.app
+- url: /.*
+  script: main.application
+
diff --git a/demo-with-google-logins/appengine_config.py b/demo-with-google-logins/appengine_config.py
index d76304e..577350b 100644
--- a/demo-with-google-logins/appengine_config.py
+++ b/demo-with-google-logins/appengine_config.py
@@ -5,7 +5,7 @@
 # this file.  If you use os.urandom() to *dynamically* generate your key at
 # runtime then any existing sessions will become junk every time you start,
 # deploy, or update your app!
-import os
+
 COOKIE_KEY = 'do not use this key'
 
 def webapp_add_wsgi_middleware(app):
diff --git a/demo/app.yaml b/demo/app.yaml
index 1d6ef71..3cd13a9 100644
--- a/demo/app.yaml
+++ b/demo/app.yaml
@@ -1,10 +1,12 @@
-application: yourappid
-version: 1
-runtime: python
-api_version: 1
-
-handlers:
-- url: /stats.*
-  script: $PYTHON_LIB/google/appengine/ext/appstats/ui.py
-- url: /.*
-  script: main.py
+application: yourappid
+version: 1
+runtime: python27
+api_version: 1
+threadsafe: true
+
+handlers:
+- url: /stats.*
+  script: google.appengine.ext.appstats.ui.app
+- url: /.*
+  script: main.application
+
diff --git a/demo/appengine_config.py b/demo/appengine_config.py
index d76304e..577350b 100644
--- a/demo/appengine_config.py
+++ b/demo/appengine_config.py
@@ -5,7 +5,7 @@
 # this file.  If you use os.urandom() to *dynamically* generate your key at
 # runtime then any existing sessions will become junk every time you start,
 # deploy, or update your app!
-import os
+
 COOKIE_KEY = 'do not use this key'
 
 def webapp_add_wsgi_middleware(app):
diff --git a/demo/templates/index.html b/demo/templates/index.html
index 795e37e..d0a50e1 100644
--- a/demo/templates/index.html
+++ b/demo/templates/index.html
@@ -20,7 +20,7 @@ <h1><a href="http://github.com/dound/gae-sessions">gae-sessions</a> demo with RP
     <tr><th>During this sign-on</td>   <td>{{ num_now }}</td></tr>
   </table>
 {% else %}
-  {{ login_form }}
+  {{ login_form|safe }}
 {% endif %}
 </div>