Fixed build errors on Window caused by previous check-in