Minor changes for Linux build.