Re #6630. More stuff to make osx happy.