Small private updates for Windows Template Library