Fixes for MSYS