Fixed win compatibility issues