Fixes with latest SDK.