Fix more documentation failes

Issue #7111