fixes for s1 & s2