More OSX fix attempts