Get fixes from #5020.