Fix a few more conflicting keys