More crashbugs fixed