BLD: Fixes for building on win32 with MSVC 2008