updates for recent sdk and api changes