Added suggestions from @jancborchardt in #9517