Smp fixes

Fixes some stuff as listed below