Typography Fixes Take 2