Changes regarding latest SDK.