Submissions for issues #321 and #945