Fix a few defects.