Fixed some S2 issues