Small fixes during doc warning cleaning