fixed a couple more crashes