- Add NO_ARCH - Switch to options helpers - Regenerate patch and switch to patching an actual file instead of symlink to it