Fixes for Windows/Visual Studio.