- Fix many crashes