949 and 972

are fixed by these edits.