Fixes towards r_smp