Cleaned up font fix changes.