Final fix for Font issues.