More font/unit changes