Fixes to the Champion model creation system.