Fix more code review finds.