More changes for Linux and Mac compatibility.