Minor changes.
Attempt to fix Mac compatibility.