Merge "More Mac fix."