Fix a few errors