Fixed 2 more patches from debian/patches