Fix up some issues in the combo room