correct some things

Change-Id: I2285ce1b464b70f3c303617534c828f40ca01381