Fixes for documentation build errors