Doc nits cleanup, round 2