Fix a few attributes