Updates to ensure compilation with Visual Studio