Fixes by comments for pullrequest