Fix some GAE deprecation warnings