Bend some recent changes to standards (#669)

5 files changed