Fix more MSVC 2012 issues