Build 2, Fixes SMP