Small updates for S2