Preliminary MSVC 2003 fixes