More fixes for MAC.