Light edits in 3.1