Code review comments fixes.