Tweaks in termination phase