Add support for no_terminate during init