Fixed some issues with the annealing