add minor windows-specific fixes