Adds some multi-platform support, untested