Misc fixes around fragmented training.