Fixing a couple of crashes.