Updates for better cross-platformness.