Upgraded GAE version and small changes