Replaced more glyphs with references