Fixed incompatibilities between Linux/Windows