Minor updates pulled in from dependent repos.