S999: mo' stuff

Change-Id: I5349654e1de69e14ad61a14ac2c59b63d614a0eb