Minor fixes

Signed-off-by: Geetesh <kalakotig@gmail.com>