correct some things

Change-Id: I62dfc7cc2f6e1de8bb143d94e0af0cf6da818b95