Add minor stylistic fixes Upstream-commit: a7690076c955d242b4590fcf557f15e1029d0c8b Component: engine