Docs generation fixes for 4.0 release.