Fixes with vc++