SDK 2.0 fixes

Now compiles.