SDK build fix2