Fix a couple of minor problems.