Fixing some more crashes