Fixes for MSVC2010