Fix for PreInitialize, including FontClient