Squashed some bugs, and prevented some crashes (again) :)