some fixes for champion class