Fixing Issues.

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