Fix a few more