fixups for MSVC2008 compilation