vc++ fixes