Fix Sid

static and smoke & a handful of splinters