Fix the SDK stuff