Bug fixes to GAE integration