Visual Studio compile fixes.