All the trivial code review changes