Fiddling to make things work on OSX.