Fix to code review comments