Improved glyph handling