Seemingly fixed 'random' crashes.