Fixes for Macs.