Fixes by comments.