Fix bitfields for glyphs 1 and 4, more diagnostics