Revert some MSYS functionality because it wrong now.
Some fixes.