Corrected callbacks for autoleave-plugin