More crashes in SMP fixed