Fixing MSVC export problems