Minor tweaks for Mac OSX build compatibility.