Further improvements on Font's handling