Fix errors; thread stopping disabled