Minor changes, should crash less if certain bugs reappear.