Re #9651. Fixing the mac builds and doxygen warning.