Fonts, unit handling fixes