Fix AutoStart and AutoTerminate