Fixed compile time warning by adding upstream patches

No match.