fix several problems when complying

only s1 and s2
fix