Some adaptations for Windows