Round 2 of Windows fonts fix