Another round of minor updates (#781)