Fix issues

[Urwa-Zaheer]

Please check if the PR fulfills these requirements

• The commit message follows our contribution guidelines
• This change does not contain any possible security vulnerabilities

What kind of change does this PR introduce?

(Bug fix, feature, docs update, ...)

What is the current behavior?

(You can also link to an open issue here)

What is the new behavior?

(if this is a feature change)

Does this PR introduce a breaking change?

(What changes might users need to make in their application due to this PR?)

Other information:

if there are other information