Minor comments from JD