Mostly safety changes, and mostly subtle