Improved handling of SMP