Fix two crashers.
4 files changed