Add: minor changes for Windows platform.