Fixes for stupid Mac.