Smaller changes to build on Linux