Fixed a few things to get it to compile on Mac. (Commented the fixes.)