More fixing for Mac.