Fixed bugs with msvc++ v120 beta