Minor changes for OSX compatibility what was lost in the merge.