Make SG usage consistent