- Fix crashes