More fixes to avoid bad hbox in generated mathml