Smal fixes for Mac.