minor fixes before the finally.