Fix compiler/linker errors in Visual Studio introduced by recent commits