Changes to build on linux