Latest changes to the training infra