Rolled back S2650 changes, corrections for MinGW compiles