Follow-up to bug 941693 - Fix mac builds