Fix additional comments from #1124