Fix even more crashes