Fix Glyph Bugs