Hopefully these patches are good, going to update the packages later