Fixing Issues.

Signed-off-by: BhanuPrakashRyaga <bhanu.555prakash@gmail.com>