Minor stuff from #6403