Minor updates to Issue 6.1