Removed several patches (accepeted upstream).