- Fix a couple crashes seen in the wild