Assorted local fixes from Mac