Fixing GAE bugs