Fix a few bobbles.