Fixes to compile under Visual Studio.