(MSVC 2003 PCE) Build fixes