Just some minor fixes

Change-Id: Ibd5fe2a66146e2c74f47d59a9c7059d347c3598c
Signed-off-by: Chintan Shah <cgintan1998@gmail.com>