Follow up of the comments in the issue.