Some more adjustment to build on Linux systems.