Upgrade to SDK 1.8