Fixed CLI Windows compatibility