Changes to get things working, some ndb, some SDK version changes