Windows-specific fixes