Docs Challenge May: Issue cleanup part 2