Fix a couple of bugs in combiner.