small edits of issue 645 and 646