Little more failure epilogue cleanup