Add lost patch for GCC-4.8.1. Fix some issues for MSYS2