- Some work to make it more Linux compatible