Merge "Yet another Mac fix."