Minor cleanup to combos