Fix some SMP bits I missed