Fix a few mistakes