OK, I think I've completely fixed the issue with mass adjustment during annealing.