Fix a few more crashes