Fix a few details.