Some changes to build on linux