S000: Tweaking

Change-Id: I287431e3dbc81b459b0175df1af985b05f788791