(MSVC) Two linker errors remaining