Fix epatch invocation again, add missing files.