S999: more stuff

Change-Id: Icb6856bd1b76df150d01b09a9039b62b2603a266