Fixed some other crashes