Fix build after overhaul of SDK.