(MSVC 2003 Xbox 1) Some fixes