Fix a bunch of mac compilation issues in performance branch