Moved msys specific code