Fix a few more errors