Tweaks to get things compiling on Mac.