Some modifications to the patches