Fixed more review comments

Fixed more review comments

issue #2806