Some 6.0 glyph cleanup