Misc fix for SMP