More fixes for Macs.