More crashes

Fixes more crashes.