Several Mac-related branding fixes