[#00] Fix crashes