Add Oriv's patch, among other things.