s1 fixes

Change-Id: Ieba0fa89c82f10b2b59f040e4f9e0d39fa3b1e8c