Fixes for broken Visual Studio compiler.