Fix OSX capability issues