Fix Some Crashes