More tweaks to the combo stuff.