Re #10813. Fixing some of the osx errors.