More Mac building fixes