Crash bug fixes across the board.