Last OS X build fixes, I promise

This time, I actually compiled on Mac.