Fixing Issues

Signed-off-by: BhanuPrakashRyaga <bhanuprakash.ryaga@kony.com>