More typography output fixes