Small fixes SDD