Upgrade to SDK 2.0 preview 5

Upgrading cause the code to break so I went about fixing it.