master
Termination fixes