Fixed all relevant changes for combo learner.