Fix a few details