Fix some yarddoc issues
Land #3338, yardoc fixes