appengine fixes