Fixes for Mac.