After review fixes
(cherry picked from commit 961a9866c923f07df5043ceb7d300dd71b88e7ba)