Fix some more crashes