Fix more MSVC2008 issues