Fixing more appengine issues