Fixed cross-platform issues.
3 files changed