Fix a few redundancies