S000: Minor fixes

Change-Id: I8dcecd8b5621b4e10fa6814ab937cf4f0ad028e7
Merge pull request #1 from autowitch/working

Working