Prepping for release
Fixes from crashes found by Karen.