WIP MSYS changes