Fixes for upstream changes to truetype junk