Finally fix patches?