AppEngine bug fixes