Several Crash Fixes