[No reviewer] Sp fixes