OSX fix-up