Fixes for MSVC 2010 Express