Clean up some crashes