More work on the MinGW build