Some corrections from issue #6