fixes for MSVC6