fix some more

Change-Id: I11d995d6a9bbb722cff9db004f7f2b7a0fdc9e02