more fixes for big glyph refactor