Fixes for the Win32 MinGW build, introduced by recent changes.