Several crashes fixed.