More OSX changes: need tested.