Fixed Windows incompatibility issues