Made everything a little more cross-platform.