- Fix a few more crash bugs
