More fixes to MinGW build