fixed more code for GAE