Minor fixes

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>