More r2 font tweaks