Fixes for new SDKs