fixup so patches works