Added cross-platform goodness.