Some fixes after merging branches
Remove __OUTSIDE_MSYS__ definition