More changes for Linux build