Fixed windows compatibility issues