Fixes for Windows code.