Just some minor fixes

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