Mac compilation fixes.