Doc generation fixes