Fix matcher, disable persistent undo