Fix issues with App Engine datastore
6 files changed