minor adjustments for Windows platform