Fixed early termination and normal termination in controller as well as
other signals.