Fixing the SDK's