More changes to try and get compilation working under old versions of Visual Studio