Sorry for the restarts tonight.

Done some quick fixes to fix some crashes.