Changes in otcli to be buildable on windows