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

Excuse the bloody copyright issue. I blame Tin for reasons I don't know..