Yet another part of review fixes.
(cherry picked from commit ec02d316d05e9e5b6e377487fb37be5779058998)