wrapping up fixes to import for training group model changes.