Add suport for --no-terminate on init