SDK build fix3