Made things more cross-platform friendly