Followup fixes that I missed during an earlier rebase.