Some more documentation build fixes