additional tweaks for MS-Windows build