Add some more needed patches