Changes to build & run on linux