App Engine tweaks