Fix some errors

Change-Id: I0000000000000000000000000000000000000006
Signed-off-by: Silencieux Le <silencieux.le@gmail.com>