- sdk: build fixes on windows related to the prev commits