Pull in some minor-edits