Updates from Pull requests comments.