Update to make the current SDK compatible with GAE

This should be fun