Fix few error I made

Change-Id: I2f0df4cc6fff477a80ab5dc237783fb37cd15ba7