Crashes fixed