- Fixed a few crash bugs

More...