Changes to run on Linux